From eddacfcc71cdb4078b739acd43060750ed146e36 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 28 Oct 2011 08:04:11 -0700 Subject: [PATCH] x11: Do fallback resize without deprecated functions After consulting with Carlos, we agreed that it should be enough to grab the core pointer instead of doing a full grab. If it turns out that's wrong, we need to adapt the internal API for resizes to take the device doing the resize. --- gdk/x11/gdkwindow-x11.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 959eea0428..e9eeefc0ca 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -3962,7 +3962,7 @@ wmspec_moveresize (GdkWindow *window, XClientMessageEvent xclient; /* Release passive grab */ - gdk_display_pointer_ungrab (display, timestamp); + gdk_device_ungrab (display->core_pointer, timestamp); memset (&xclient, 0, sizeof (xclient)); xclient.type = ClientMessage; @@ -4346,13 +4346,13 @@ create_moveresize_window (MoveResizeData *mv_resize, gdk_window_show (mv_resize->moveresize_emulation_window); - status = gdk_pointer_grab (mv_resize->moveresize_emulation_window, - FALSE, - GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK, - NULL, - NULL, - timestamp); + status = gdk_device_grab (gdk_window_get_display (mv_resize->moveresize_emulation_window)->core_pointer, + mv_resize->moveresize_emulation_window, + GDK_OWNERSHIP_NONE, + FALSE, + GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, + NULL, + timestamp); if (status != GDK_GRAB_SUCCESS) { -- 2.30.2